Merge \"media: document format keys for MediaExtractor/CodecCapabilities\" into nyc-dev
am: 556e012979

Change-Id: I259b49699bf3e606da8e40aba85288b5a41fe31f