Merge "Allow mediadrmserver to access media files" into nyc-dev