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

Change-Id: I35b90bd29c393a3ea81d357f428afc9a05fb8998