Merge "Revert "fix 'adb shell'""
am: 32778ca983

Change-Id: Ifeaae5bfd99609bf2f8f51b40874638f4a45762d