Remove two devices that have been merged into moto_msm8960