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

* commit '31a7345c9c9398c18d6fb6fa4118bd2bfdb437e2':
  Respawn app_main if ADDR_COMPAT_LAYOUT is not set