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

* commit '1da473b4cc22dc7121d5f07489bfc447d5bacc08':
  Headers update from bionic for x86_64 support