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

* commit '071c78e0070f4add5b811b1abccc9e6f6f312276':
  Don't set ADDR_COMPAT_LAYOUT on the emulator