Merge b275300e2f3b8e5ee993a02f3f70aa9935ec52d5 on remote branch

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