Merge "Merge remote-tracking branch 'aosp/upstream-master' into up-shaderc2"