Merge "fmem: remove ASSERT_SPINLOCK macro" into msm-3.0