Merge "Fix aarch64 and x86-64 AndroidConfig.h."