msm: HTC: Unbreak build

Change-Id: Id4061194121fe661189b55e07a6048bff45047c9
Merge branch 'remote' into mkl