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

Change-Id: I47aca1934465ebebb41add13d4f77e7984bb9d69
Merge remote-tracking branch 'upstream/android-5.0' into android-5.0
Omni sync