Merge change I915efc49 into donut

* changes:
  Update docs for NDK.