Vendor derps

Change-Id: I66fb39125f6e8236a2676754b3dec0dbed166805
Signed-off-by: Evan Anderson <evan1124@gmail.com>