am 6736cca0: am 52410be8: Merge "mediacodec: Don\'t suggest calling getOutputFormat() immediately"

* commit '6736cca08df84328913962f9a14fafa13a25d390':
  mediacodec: Don't suggest calling getOutputFormat() immediately