Fix multiple builds 2/2 lazy coding

msm8660 is a common board, HTC =! samsumg