Merge "Clean up after MIPS got read barriers support"