Merge "arm: Fix compilation error with gcc 4.5.2" into msm-3.4