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

* commit '6098579a205848339cf6886f5c6d476ccf40e6fe':
  Don't use ADDR_COMPAT_LAYOUT on the emulator