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

This reverts commit f16a9fef050bd20659b29d099b8831dcc8295e37.