Merge "Add x86_64 to the bionic headers."