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

* commit '7f1ca82861d74bccbf854e1b9e741a35773b3160':
  Add prebuilts/ndk/android-ndk-r8