Merge "Track rename of base/ to android-base/."