Merge "scsi: ufs-qcom: remove androidboot.bootdevice check" into msm-4.8