Merge "adb: increase the shell command length limit." into oc-dr1-dev am: b7806433bf  -s ours
am: 32e08e663a  -s ours

Change-Id: I594cbe6f3b037e85922831d6a07d7f39f6ecf943