Merge changes Ieaecb4a9,I04f46f86,I61d0e3f3 into nyc-dev-plus-aosp
am: bb0e12b4e0

Change-Id: I6116d9965b5a5c443c4442e496c048cd7391c87d
tree: 20bfc97673994865feda879b520daf29f893be10
  1. Android.mk
  2. LICENSE
  3. MODULE_LICENSE_BSD
  4. NOTICE
  5. README
  6. src/
  7. test/