Revert "Build using kernel/htc/CFXkernel_htc_msm7x30"

This reverts commit 506af28ed014042aa7174b76ca56f50ac995c4dd.