Merge "Update lib-boostrape for 64-bit libraries built with GCC toolchain"