merge in nyc-release history after reset to nyc-dev
tree: 76a9629b56c3259cc81b768c883a728ccdce6e79
  1. java/
  2. Android.mk