Add spin loop to mutex, overhaul monitor am: 0d508a0110
am: c680fb9e06

Change-Id: I33d86a9a7154c6ce22a886e5c289980125da0feb