am 112bd5ad: am 85967c7e: am d46e3f1f: am 3d3dd4a1: Merge "Fix aarch64 and x86-64 AndroidConfig.h."

* commit '112bd5ad2e57c621abbb36035e1820d7844882b9':
  Fix aarch64 and x86-64 AndroidConfig.h.