Merge "mediacodec violates "no Binder in vendor" rule"