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

Change-Id: If432ec079d3b8e285ac34cc5eac650b148f761a9