Merge change 1359 into donut

* changes:
  Remove references to 'cupcake' in all of NDK (replace with 'android-1.5')