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

Change-Id: I482ec13bc3cdf1d7b1a485c2c7baee5131102c56