msm8960: Fix mismerge

Change-Id: Iab54e1bcfbe2a72036232940fd566648af190f8f
msm: camera: Update HTC camera stack drivers

* HTC kernel package: m7ul-3.4.10-g40b189c
                      m4ul-3.4.10-g3862988
                      t6ul-3.4.10-gbc2653f

Change-Id: I936c6c053cc838312b721c3d0e201debf7e42281