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

Change-Id: I4b7181e49000dd07bc0cca5d0f2fa848f4018e78