Merge "Don't use ADDR_COMPAT_LAYOUT on the emulator"