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

Change-Id: Idc695a3b05a8b7741a1ce49d1407d77066b5a8f0