Investigate clusterfuzz build failures

Our clusterfuzz setup has run into some build issues; I need to figure it out.