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

Change-Id: Ibff3a0eb315366d854f3a8180d6fc02fc9ced557