Merge \"Merge \\\"media: document format keys for MediaMuxer\\\" into nyc-dev...
Merge \"Merge \\\"media: document format keys for MediaMuxer\\\" into nyc-dev am: 5059e65f am: 8ae7c6b6\" into nyc-mr1-dev-plus-aosp
am: 17a527f2
Change-Id: I447d22a508b694c35d1b87eb7f05fb6fc2fbda19