Merge 77c50122a3d3761c2edd60c4b57f43dea4893067 on remote branch

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