Merge "MediaDrm API update" into jb-mr2-dev