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

* commit '85967c7ef085b85cf54821e626e2634113fb2cbc':
  Fix aarch64 and x86-64 AndroidConfig.h.