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

* commit 'f5dcdfc438684bbe93e398b6551f915fe3fe10bf':
  Add x86_64 to the bionic headers.