Revert "fix 'adb shell'"

This reverts commit cc6d793310ad81d64a18d111ab33043791b92a52.

Reason for revert: Device boot failure. Conflicts while reverting dancol's CL.

Change-Id: Ic6929f20a60369b6f88f3caa22258e52d700f485
1 file changed