Merge tag 'AU_LINUX_ANDROID_KK_2.7-STABLE.04.04.03.015.289' into kk-merge

AU_LINUX_ANDROID_KK_2.7-STABLE.04.04.03.015.289 based on quic/aosp/kk_2.7-stable

Conflicts:
	drivers/gpu/msm/kgsl_debugfs.c

Change-Id: Ic05566391ad424abfd9f85121330311c4660a5cc