Record-only merge of r330780, r330783

r330780: Eliminate atrtc_time_lock, and use atrtc_lock for efirtc locking.

r330783: Revert r330780, it was improperly tested and results in taking a
spin mutex before acquiring sleep mutexes.