Merge "Revert "CFI compatibility with static executables and nested archives""