Merge "ART: Ship debug tools when including debug artifacts"
am: 64a102dde8

Change-Id: I41e2a0d46299785de7cb5370e71b9e062cf044d6