Merge remote-tracking branch 'aosp/master-ndk' into r16-shaderc

Change-Id: I23276486913ea38e64c45e4b5d35e95645ebd7e4