Merge "adb: increase the shell command length limit." am: 9d2e688b9a
am: 749d2a0ab5

Change-Id: Ib450863883d11cb256421e2c4f12c36d8af37570