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

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