Android O MR1 IOT Release 1.0.5 (5014699)
Merge "Fix codec output format for conversion"