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

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