Merge change 1161 into donut

* changes:
  Initial import of new NDK into donut tree