Merge "Don\'t use VLAs in adb." am: 24704399cd
am: ebd5badd84

* commit 'ebd5badd8405ede63f622453bb69d991ebf29583':
  Don't use VLAs in adb.