Merge "msm: board: Add alignment to fmem platform data" into msm-3.0