Merge "Track rename of base/ to android-base/."
am: 912ed3d8ca

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