Merge "Installd: Run debug tools when using libartd" am: d4a35a67a3  -s ours
am: 086d687673  -s ours

Change-Id: I82d47d1f7af7b0303345fa8db90d6107ba8ba614