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

Change-Id: I197b6a226b4a0be153c3e2b2096b6608b484ce2b