Merge "msm: rpm: Replace mutex_lock_interruptible with mutex_lock" into msm-3.0