Qcom GPS: Squash AOSP 4.3

Conflicts:
	utils/Android.mk

Change-Id: I2ac9414a8a4f08f48c651d8d7f7b76d40dcb4eaa
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>