Merge "Respawn app_main if ADDR_COMPAT_LAYOUT is not set"