am 90a968f0: am dd581695: Merge "Revert "Create libbase.""

* commit '90a968f0e3fb903aad41f6689c337a7e4a8d5c7b':
  Revert "Create libbase."