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

Change-Id: Ibc15819260401ae2522fd4a4ccddeb3bdfe888a8