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

Change-Id: Ib4f92789fde658855600ed129e808531a5b54e55