Merge "spinlock_debug: Fix mismerge" into msm-3.4