Merge "tools: Fix art script to run from adb shell interactively" am: 890045e5a7
am: 2d222aff4d

Change-Id: Icb796041e07041028dd6f4446d715d7a589041e7