Merge "Add arch-x86_64/bionic."