am f732108e: Merge "Respawn app_main if ADDR_COMPAT_LAYOUT is not set"

* commit 'f732108e86fcc9825d5ecaa0b65ee91469c4a24c':
  Respawn app_main if ADDR_COMPAT_LAYOUT is not set