Merge "msm: rpm-smd: Fix race conditions with SMP" into msm-3.4