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

* commit '8b9a9519c865d73ce10a5847b3b99b3cd339114e':
  Remove unused MediaFormat activity