am 1ae6ae20: Merge "Don\'t use ADDR_COMPAT_LAYOUT on the emulator"

* commit '1ae6ae2094fd0ab8c82ad1a347e7a8bd67d995e5':
  Don't use ADDR_COMPAT_LAYOUT on the emulator