am b18e0d14: am 78466f3e: am 69aa2f8a: Merge "revert ADDR_COMPAT_LAYOUT workaround."
am b18e0d14: am 78466f3e: am 69aa2f8a: Merge "revert ADDR_COMPAT_LAYOUT workaround."

* commit 'b18e0d14334d5757b21e4f089706affe29822447':
  revert ADDR_COMPAT_LAYOUT workaround.

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