Commits
Nick Kralevich authored and Android Git Automerger committed b18e0d14334M
am 78466f3e: am 69aa2f8a: Merge "revert ADDR_COMPAT_LAYOUT workaround." * commit '78466f3eb59e804f9a6e770dbc8d764faa91ccb8': revert ADDR_COMPAT_LAYOUT workaround.
Showing diff to2325fd5d119