9dfdce5b3c
GCC can't reasonably be told that the lock ptr isn't null. Adding a private bool allows the branch to be eliminated, along with the bool. Change-Id: I0605d69474d6a6e6951be93c0af1d8caf3f77124