am 497b94df: Merge "Headers update from bionic for x86_64 support"

* commit '497b94df024cc6b4b6a5e98886dc85e8bc391994':
  Headers update from bionic for x86_64 support