Merge remote-tracking branch 'origin/android-msm-mako-3.4-kitkat-mr1' into exp

Conflicts:
	drivers/media/platform/msm/camera_v1/gemini/msm_gemini_hw.h
	drivers/media/platform/msm/camera_v1/gemini/msm_gemini_sync.c