Merge "msm: idle-v7.S: Add NOPs to avoid ungraceful exit of GDFS on 8x25" into msm-3.0