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

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