am 45d59a99: Merge "Make MediaDrm APIs public" into jb-mr2-dev

* commit '45d59a997f639662e4ce427933d81667fee39bcd':
  Make MediaDrm APIs public