Merge "Pass the right CFLAGS to libarttest(d)."