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

Change-Id: Ib450863883d11cb256421e2c4f12c36d8af37570