Pull in some patches to really fix the build of security/gcr