Merge "Fix libcorkscrew for x86 targets (bionic) as well as the host (glibc)."