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

Change-Id: I5cd6beb1fbf71d4db15c680d0f5fcc96d606023a