am aa0406b3: am 6d0a7020: Merge "Fix race in inflating thin locks."

* commit 'aa0406b3f1b60d13269bcdadb89a1a26ee120dae':
  Fix race in inflating thin locks.