Refactor to msm8660-common