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

Change-Id: Ief4ef8abe36bb42eafcd92665083c7518aba1c99