am fc8bd4d3: am 35587a0c: Merge "Don\'t set ADDR_COMPAT_LAYOUT on the emulator"

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