Merge "Fix wrong length passed to AAIOBE on x86/x64."