Merge \\\\"Pass the right CFLAGS to libarttest(d).\\\\" am: e554eccb am: b9c5c771 am: e7afcedc am: 8115fb37 Change-Id: Ib98c263144cacb0786097a170e789e5ed4f3141d