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

* commit '78466f3eb59e804f9a6e770dbc8d764faa91ccb8':
  revert ADDR_COMPAT_LAYOUT workaround.