Fix toybox_vendor dependencies again. am: 2211432f50 am: 2491131bd4
am: 35c8dee8cf

Change-Id: Ib1a52d5367879e2d592d94367bdc55b6c9a14edc