Merge change 1307 into donut

* changes:
  Remove the ROADMAP NDK file as it shouldn't be packaged with the NDK