Merge "Revert "Update for libbase.""
tree: 2e6faf54c6782b6355feca6b43faab1633c91b43
  1. client/
  2. include/
  3. server/