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

* commit '35587a0c47c33a8eed7817dc705dbf502f7b5b60':
  Don't set ADDR_COMPAT_LAYOUT on the emulator

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base