Merge a13898e9ccd870799291b31098df178a2efbe257 on remote branch

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