Merge "Refactor conditional uses of ReadBarrier::AssertToSpaceInvariant." am: 7ec532fd am: 2d1f6479 am: d1bb19bc Change-Id: Ic365112f786d4cfb7a25ba3c898d373af5b48bb6