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

Change-Id: I248fbd3da8dd0376d724ca8aee7f8e71bfb260b0