Merge "Rename base/ to android-base/." am: 5986d9f263
am: a77731e14d

* commit 'a77731e14de614e26ddbf21daadba217c647be68':
  Rename base/ to android-base/.