am 6c631f7a: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '6c631f7a4d5b26d21059ae9ec58f84be1421f27e':
  init: Set ADDR_COMPAT_LAYOUT before spawning processes.