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

* commit 'dd5816953de6aebc51aa4cc6f69945fbb9cd4b2a':
  Revert "Create libbase."