Merge "Revert "Revert "CFI compatibility with static executables and nested archives"""
am: fba0a560de

Change-Id: Ib8eb5180a3f6d988f13f7d166a90beeeed302bb4