Merge "Use -Werror in external/compiler-rt" am: b7a99780f9
am: 9020d5ed4b

Change-Id: I92668ad47dbd8331993c20945636e1216652d9de