Merge android 4.3 kernel headers

Conflicts:

	include/linux/msm_ion.h
	include/linux/msm_kgsl.h
	include/linux/msm_mdp.h
	include/linux/msm_rotator.h
	include/linux/msm_vidc_dec.h
	include/linux/msm_vidc_enc.h
	include/media/msm_camera.h
Revert "Merge android 4.3 kernel headers"

This reverts commit eea6c580669ba7f14b0d89bebb33527a1a000919.