Merge "Run $(AR) with LLVMgold.so plugin for CFI targets." am: 96c81711c1
am: e729e804fe

Change-Id: I8a20ce05dffbf33b7c3480e13ee40cf0257dc06a