Fix

Change-Id: Iaf5293c4a1195481136180c6088d038f95ec4418
Phone: add PhoneLocation.java to static library for other packages to use

Conflicts:
	res/values-zh-rCN/strings.xml

Change-Id: I4032073d49ce21ad071b84589a6d3d9d136e5bd3