Merge "msm7x30: fix -Wreorder warnings" into cm-10.2