am 9df37571: (-s ours) Merge "Add prebuilts/ndk/android-ndk-r8"

* commit '9df375719f7d4995eedbda800d50b735983c7401':
  Add prebuilts/ndk/android-ndk-r8