Merge 1455fbf5b3445509a6bdc0d40895fb2339866402 on remote branch

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