am 69aa2f8a: Merge "revert ADDR_COMPAT_LAYOUT workaround."
am 69aa2f8a: Merge "revert ADDR_COMPAT_LAYOUT workaround."

* commit '69aa2f8a0555a5ca37fa78d5cfcbf59d7476d044':
  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