Adapt to github.exlib changes

Change-Id: Ia1b0bd6f3f731013c2b0649230b17bcc9817aca5