Re-align headers for AOSP building

Change-Id: I98bd35c4d05210165150d71d77cc94029ad2f449

Conflicts:

	include/media/msm_camera.h
msm8660: copy msm-specific headers.

Change-Id: Ib54a79b09506ba590f99c1cbd16b52cc62558967

Conflicts:

	include/linux/Kbuild
	include/media/Kbuild
msm8660: Fix msm_camera.h

Change-Id: I60d51b92d84df91057d0103c70978032bddd0331