Merge "hal: msm8916: seperate device support from other flavors"