Merge "msm: board-8064: Port ION from 8960 to 8064" into msm-3.0