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

* commit '5cc87a392ed9f416bdbd07362b290ea7b959d864':