Merge "Remove phone from frameworks/base subdirs"