Merge "Increase the maximum shell command length to 4096ish." am: 3472410eac
am: 2783126cab

* commit '2783126cab5ca2a1aae5779c988a84abff97cb19':
  Increase the maximum shell command length to 4096ish.