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

Change-Id: Ibe6d6d4426482466a68738359d04b7f604db8dd8