Merge "Don't set ADDR_COMPAT_LAYOUT on the emulator" into jb-mr2-dev