[automerger skipped] Merge "Make adbconnection try to start the JIT if it is not running." into pi-dev
am: 26b1580f4d  -s ours

Change-Id: I6aada12aa7c0b81d3f45c54adc29344f9802b123