am 2f501cc0: am 0ca1e98f: Merge "media: Clarify MediaCodec and CodecCapabilities documentation" into mnc-dev

* commit '2f501cc00a09d328e39e4c02aa72b894624acf54':
  media: Clarify MediaCodec and CodecCapabilities documentation