Merge "core_ctl: Increase MAX_CPUS_PER_CLUSTER to 6" into msm-4.9