Merge "Allow mediadrmserver to call mediacodec." into oc-dev