Revert^2 "Add spin loop to mutex, overhaul monitor"
am: 3d52abe40e

Change-Id: I6b7220e7235b01624df2d02b29dc1e2f83108c79