Merge "CFI compatibility with static executables and nested archives"
am: 22b6abc96d

Change-Id: Ie72297f286af9ecf0ffeea9d093351c2c7a82fa0