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

Change-Id: I649ae8c2143f7ccbec0458bd2ff78c2aafe45178