merge latest CM commits & fix merge conflicts

Change-Id: I9a9ad384cbfc42b80fa0f3a8740ca4c696c53326

Conflicts:
	arch/arm/boot/dts/apq8074-rhine_togari_windy.dtsi