Merge \"Disable CheckSwapUsage test with read barriers on x86.\"
am: 5fc9ddef31

Change-Id: Ib3d6cd1a84663842581f0eb0799cb19df7c41465