Merge "Apply HWASan to libc-in-recovery." am: 56cb729e82

am: 178bafe6e3

Change-Id: Ic319aae02669f00f92f59bd9e79941458e7fcd7b

cc/sanitize.go

@@ -299,7 +299,8 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) {
 	}
 
 	// HWASan ramdisk (which is built from recovery) goes over some bootloader limit.
-	if ctx.inRecovery() {
+	// Keep libc instrumented so that recovery can run hwasan-instrumented code if necessary.
+	if ctx.inRecovery() && !strings.HasPrefix(ctx.ModuleDir(), "bionic/libc") {
 		s.Hwaddress = nil
 	}