[automerger skipped] Add adb to the list of host executables
am: 495a3dd7a5  -s ours

Change-Id: Ie073ec2f0cf4a080e0c8eab5f9b7429da8a7546f