Merge "Rename base/ to android-base/."