am 36e2bc95: am 90dada06: Merge "Update arch-x86/lib-bootstrap/lib64"

* commit '36e2bc959feb77b875761710cb8a3a1f43882703':
  Update arch-x86/lib-bootstrap/lib64