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

Change-Id: If461a20e0fc2dabb62bbdf8bbfbc5d41ef803a85