Merge \"media: clarify notes in MediaCodec doc\" into nyc-mr1-dev
am: 82d886434d

Change-Id: Iacc43f3db9a41a0373227fc09f3590cf275ec34f