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