kill htc common

Change-Id: I107bf12143431c7421f90552383042dfa01b13b0