Merge "Pass the arm/thumb cflags to assembly files"