Merge "Unhide MediaExtractor.getPsshInfo()" into jb-mr2-dev