Merge "Make linking with libcompiler_rt conditional"