Merge "Refactor conditional uses of ReadBarrier::AssertToSpaceInvariant."
am: 7ec532fd63

Change-Id: I50e7d4eb1d92c66190ea6d4c8764a6c7488e2d3f