Merge remote-tracking branch 'cm_mako/cm-12.0' into staging/cm-12.0

Conflicts:
	cm.mk

Change-Id: Ic98cdde0e578b723f3028dfb686e669e14b63124
powerHAL: make sure powerHAL doesn't override user's CPU frequencies and break early on touch interaction if current governor are not ondemand or interactive

Change-Id: Ibd32ca51de51cb2398c3092a8f6fba08925a5f31