Merge changes from topic "am-7c53888a-745f-41b0-bfc8-21ee3f17b58d" into oc-dev am: bbb4493b0a
am: 3a87a392d6

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