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

Change-Id: Iba31933f5ba1b50fef64292fb6a98cd031a6f1fd