Merge "Use the .cfi variant of a static library where needed."
am: 061fcfc254

Change-Id: I668b215133aa51ad29695fc15f842f4de71645aa