fix up adb to prefer /sbin/sh if it exists

Change-Id: Ifa68efec387e6c12dc4bb2d0e764b8ecf96c0ad5
Merge remote-tracking branch 'upstream/kitkat' into kitkat