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

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