Merge "Track rename of base/ to android-base/." am: 316a0dd842
am: e2a9563be1

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