Merge "Clean up after MIPS got read barriers support"
am: 0dc3c953f3

Change-Id: I74a872e65acd68a3041a61307fe1f6244dcd4e18