am e00a3b80: Merge "Don\'t set ADDR_COMPAT_LAYOUT on the emulator" into jb-mr2-dev

* commit 'e00a3b80635c830dc57510556231cc40db6651f5':
  Don't set ADDR_COMPAT_LAYOUT on the emulator