Merge "Don't set ADDR_COMPAT_LAYOUT on the emulator"