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

Change-Id: I74bf38385e3a1102549774fae60219f92943043b