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

Change-Id: I4a31894d19d1e86397efc138ccf6e50476c8cbd3