Revert "Build using kernel/htc/CFXkernel_htc_msm7x30"

This reverts commit 8094c42a3d6d460e99412fe024c343013fe60b86.