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

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