Add OC and simple gov into msm2
GPU: Fix merging issues & + tweak

Conflicts:
	arch/arm/configs/aosp_jf_defconfig