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

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