am fa00a604: am abc6d891: Merge "Update lib-boostrape for 64-bit libraries built with GCC toolchain"

* commit 'fa00a60465f3f712193ee062b13be5f79b5d1ba9':
  Update lib-boostrape for 64-bit libraries built with GCC toolchain