Merge "Don't use VLAs in adb."