am 6874ed79: am a9d2f9fb: Merge "stagefright: preserve output format flags on...
am 6874ed79: am a9d2f9fb: Merge "stagefright: preserve output format flags on format change" into lmp-mr1-dev
* commit '6874ed79':
stagefright: preserve output format flags on format change