Merge "target: msm8974: Fix platform subtype"