[ARM] Fix up buildbots after r246360