am bd2e045e: am a383b02c: am 8b9a9519: am 331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev

* commit 'bd2e045e177c831925653ee43b18196c130e22e3':
  Remove unused MediaFormat activity