Merge "Add phone directory to frameworks/base."