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

Change-Id: I086a5de8bb581d5d908dacee82e4d93403e73320