Merge branch 'cm-12.0' of https://github.com/TheMuppets/proprietary_vendor_samsung into cm-12.0

Conflicts:
	hlte-common/Android.mk
trlte-common: Use stock NFC hal
Merge remote-tracking branch 'Slayer/cm-12.0' into cm-12.0

Conflicts:
	hlte-common/Android.mk