Merge "Fix wrong length passed to AAIOBE on x86/x64."
am: 4054e74d66

Change-Id: Idbea1b42e960683357e09a06988a93c73ee1aa90