Merge "Merge "Disable mediacodec.policy for riscv64" am: d69e9fa37b" into stage-aosp-master