Merge "Change mediacodec to android.hardware.media.omx@1.0-service"