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

* commit '9ff83ae0e4f5e7de90d3bc5e8bd2d7d0b45d371b':
  Track rename from base/ to android-base/.