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

Change-Id: I03633ef4d5bae7c117ef133e40cf4c0ce57d088b