Revert^2 "Notify waiters when releasing the monitor"

This reverts commit 9cec9658.

Reason for revert: Changed lock ordering to not require reacquiring the
monitor lock while holding the wait lock.

Tested: 1000 iterations of ThreadStress
Bug: 117842465
Change-Id: I7b54943052c5eba367eac86da9646bfc81bc1163