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

This reverts commit 8350c4c540b6ad8a5e5ea01b6aacb9e92fa3d7dc.

Reverting the revert so a proper fix can be applied.

Change-Id: I69f106dfd294198e03a62bcd88c8f18033410141
2 files changed