Merge "Adapting simple_decoder to use new file reading API."