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

Change-Id: I39e83bb096a1ecc9337dc0b9da2c68c6c7bd4190