Nuke htc/common

Change-Id: Iecfc27863caafc7dff50218335d1838e1b425783