Merge changes I913553e4,I178f6cde
am: ac54f2ff3e

Change-Id: Ia0b2e0bb03bbae1dd082fe026e211848b32d956e
tree: 039cc0abd213ebd5c4f9df4e664044e974506e69
  1. src/
  2. test/
  3. Android.mk
  4. LICENSE
  5. MODULE_LICENSE_BSD
  6. NOTICE
  7. README