Fix adb-kill for multiple package definitions