Merge "ART: Fix for pkill on device in run-jdwp-tests.sh" am: 1d00c5313b
am: 34890bb2f7

Change-Id: Ia83aeee6f917370fc6cb7d894687b786849a810b