Track qcom_camera from CM

Change-Id: I1f5eb128a3918a2eb17f1d9fe408c42cc49f1668
Merge branch 'kk' of https://github.com/CarbonDev/android into kk