Merge "Support an additional alias for 'adb shell.'"