am 6dee3b9a: Merge "Add x86_64 to the bionic headers."

* commit '6dee3b9aeec40bb518c1a29b4462300869a03d8e':
  Add x86_64 to the bionic headers.