Merge branch 'kk4.4' of https://github.com/TEAM-Gummy/android_device_oppo_find7 into kk4.4

Conflicts:
	gps/Android.mk