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

* commit 'c415108e0e1eae28827db43ddacf987040a3b150':
  Headers update from bionic for x86_64 support