Merge "Use -fno-integrated-as for Mips" am: 624569b3ad
am: 3fd0869d94

Change-Id: I9db97fbb323a2d70bf5771b1cf163f206baa09dd