Merge "Update coverage sanitizer flags in make"
am: 846bd7e00d

Change-Id: If5b06376ddb67ddecce4162ddeeb4828c35fa47f