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

* commit '2dab2a317a8e7194cc75c90703c532da94692ad4':
  Fix race in inflating thin locks.