Merge "Add prebuilts/ndk/android-ndk-r8"