MSM: Fix compile errors #3

Fixs compiling of htc_acoustic, msm_flashlight, and htc_35mm_jack.
Merge branch 'CAF-3.4' of github.com:croniccorey/WIP-8x50 into CAF-3.4