bring up to L

Change-Id: I00b66ac20521beb13100af088b7bfc8f07d5f71a
Merge branch 'cm-12.0' of https://github.com/CyanogenMod/android_device_samsung_hltespr into cm-12.0
Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0

Conflicts:
	system.prop