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

Change-Id: I7285145089c3b45096710398de777293b3b77d76