am e3734499: Merge "Update for libbase."

* commit 'e37344992f49c8e0e6e9b816f590afbd00a961ca':
  Update for libbase.
tree: 25f3201a6c8a8c1590e202fee54492530161cb18
  1. client/
  2. include/
  3. server/
  4. Android.mk