Merge "Disable CFI on Mips and add -march to linkflags on ARM."