Merge "Ahat: Use art -d in tests"
am: 0406e1e599

Change-Id: Ibca84adc0c495cd884d747f12b42d17af3bebb10