Phone: Add PhoneLocation.java to static library for other packages to use

Change-Id: I680bcb8ebe5a989d90b7bb12fb0bf14e18b7d574
Phone: fix typo

Change-Id: Icbb2eb473b2398b4e93a13e0e70da8452b549a5f
Merge branch 'jellybean' of https://github.com/LOSP/packages_apps_Phone into jellybean

Conflicts:
	Android.mk

Change-Id: I0d8a356f8e553836b822338053206b155de83f9b