am 7c378e4b: Merge "Fix a race condition during the rosalloc verification."

* commit '7c378e4bc3aa6928f48d235e88e652e8b82beef4':
  Fix a race condition during the rosalloc verification.