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