Merge \"Pass the right CFLAGS to libarttest(d).\"
am: e554eccb00

Change-Id: Ia50433df4a7bfee69217c75e470800f47dcee168