CAF Merge from CM

Signed-off-by: Javelin <javelinanddart@gmail.com>
Fix
Signed-off-by: Javelin <javelinanddart@gmail.com>
Add some files

Signed-off-by: Javelin <javelinanddart@gmail.com>
gpu: msm2: Sync to upstream

* Sync to android-msm-3.4-flo-lollipop-release

Change-Id: Ia0df71c0a1f102de034860f4d212a05c806fef7d
Signed-off-by: Javelin <javelinanddart@gmail.com>

Conflicts:
	include/linux/msm_kgsl.h
Fix

Signed-off-by: Javelin <javelinanddart@gmail.com>