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

* commit '4efe71ae55db09a4e3d727175df97d5bcda0449c':
  Make MediaDrm APIs public