Merge "target: msm8974: Fix gcdb/autopll merge conflict"