Merge "ART: Ship debug tools when including debug artifacts" am: 64a102dde8 am: b4f7a3bb0c am: 627494169b
am: 66e941f141

Change-Id: I00d750e482482b5e55c4d402a1036f290395c32d