Revert "camera: cleanup QCOM if defs"

 * See the camera HAL source from msm9860 to fix your compile    issues.

This reverts commit 5d9edc49c7520865193009491193e1316ffd20da

Change-Id: Ia5e62ee5cb8f2c91f5a65f1c9423eb2206431c6f