Merge "libcompiler_rt is not directly available to vendors" am: d7d7ec0eee
am: 260e2e68b9

Change-Id: If79291dbb8eead90378f45dc47da016a4b6c4fca