Revert "Revert "htc 8960-common to us""

This reverts commit 96c89edff476ff980b1203b063ae4d6c1ab2144c.