Merge \"media: document format keys for MediaMuxer\" into nyc-dev
am: 5059e65fec

Change-Id: I69c5b31fda557ea8d9ca0540f3878f566ada9b56