Merge "Headers update from bionic for x86_64 support"