Revert "Add spin loop to mutex, overhaul monitor"
am: d56f7d1086

Change-Id: I1b19fe467374e7e55afe934824bea9c87c57dccb