Allow N5120 to build gps hal

Change-Id: I1d16e8838191e850401bb8eee0286aa537a6ab33
Merge branch 'cm-11.0' into kk_mkt

Conflicts:
	Android.mk

Change-Id: I88851d3c01fbe5600811f2b70abb8203695921c3