Merge "Track rename from base/ to android-base/." am: 9f6a2ae67c
am: 8aa8fe2c64

* commit '8aa8fe2c64cf4611ba68d90992e54858a35aae58':
  Track rename from base/ to android-base/.