Revert "Revert "audio/msm7x30: #ifdef HTC audio changes""

This reverts commit 9b563e0e1a1be58c92384accda6cd9b1cb8cbee3.