Merge remote-tracking branch 'aosp/master-ndk' into shader-tools