Merge remote-tracking branch 'cm/cm-12.0' into lollipop

-Comment config_deviceHardwareWakeKeys as it isnt been implemented in f/w base for now

Conflicts:
	overlay/frameworks/base/core/res/res/values/config.xml