Merge 353a7b5ec021e28651ce4063eaf416b5a9c90e39 on remote branch

Change-Id: Id4b217e4b988424cf8b884e86859d65fa7ba3c0e
tree: cc8cf6a40cc599bcdbd0848a6f813e52e098678d
  1. client/
  2. include/
  3. server/
  4. tests/
  5. Android.mk
  6. MODULE_LICENSE_APACHE2
  7. NOTICE