Merge "Track rename from base/ to android-base/."
am: 5d8fdbb6ff

* commit '5d8fdbb6ff3d617e48198e12a2b1c10b48d22f79':
  Track rename from base/ to android-base/.