Merge "adb: increase the shell command length limit."
am: a956720898

Change-Id: Iefd9a87912141a24d0603fa4eb824b59195217c4