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