am ba2355c9: resolved conflicts for 9073a5d9 to stage-aosp-master
am ba2355c9: resolved conflicts for 9073a5d9 to stage-aosp-master

* commit 'ba2355c9810ad3113e0705d106b28d9cdcbee759':
  Fix RS NDK usage so we always pull from "current" instead of NDK 8.

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build