merge vendor files for gio

Change-Id: I1c174a6240e945d92cb6db5beb00a34578658d0f