Merge "Make some minor improvements to MediaFormat" into rvc-dev am: 7c33cc554d am: 9f8f7a2a59 am: fa3566b7c2 am: 4de6ee5b08 am: 2af561e0a2

Change-Id: Id7c8772021236996b1585e3747b2f88f45ba8002