am a9d2f9fb: Merge "stagefright: preserve output format flags on format change" into lmp-mr1-dev

* commit 'a9d2f9fbbfa6e8daa3252e88e9861d7f80a974ff':
  stagefright: preserve output format flags on format change