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

Change-Id: I837415fe5bd42e2243ac07825de92a71cd607dda