Merge "Make linking with libcompiler_rt conditional" am: 340c0c5701 am: 74e4a83d47
am: 0f7d3add7c

Change-Id: I78dc83e4bc66fc42056b5dbbb53b78c7e9231886