Remove device/htc/common references

Change-Id: Ia5248de014d99c4fa52b291afaf08b88966061d9