Merge "ART: Ship debug tools when including debug artifacts" am: 64a102dd am: b4f7a3bb am: 62749416 am: 66e941f1 Change-Id: I00d750e482482b5e55c4d402a1036f290395c32d