Merge remote-tracking branch 'aosp/android-msm-hammerhead-3.4-kitkat-mr1' into HEAD

Conflicts:
	drivers/gpu/msm/adreno_ringbuffer.c
	drivers/thermal/msm_thermal.c