Merge "msm8960: Add Conversion for LiQUID from HW-ID to machine-type"