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

Change-Id: I1f0728310d88a58891fa89d1ed54448b3ec0eee2