Merge \\"media: document format keys for MediaExtractor/CodecCapabilities\\" into nyc-mr1-dev am: 41f0e20739
am: b353834077

Change-Id: I4dd81ce125ba6bb0b5ff10c5b84cb5a1e4c958de