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

Change-Id: I149ac15dd6e31799e566bbcf9a45a967ad716f68