Merge "Track rename of base/ to android-base/." am: 4ab13d0256
am: 145ba91284

* commit '145ba91284257184f06e31d58b49af68075fe283':
  Track rename of base/ to android-base/.