Merge remote-tracking branch 'tm/cm-11.0' into cm-11.0

Conflicts:
	moto-msm8960/proprietary/lib/libgeofence.so
	moto-msm8960/proprietary/lib/libloc_api_v02.so
	moto_msm8960/moto_msm8960-vendor-blobs.mk