Merge remote-tracking branch 'aosp/upstream-master' into update-shaderc am: b252c47036 Change-Id: I9378997d10803805e3242e3f260ba25f5dc49b0d