Merge "Remove test dependency on ubsan runtime" am: c77d25e441
am: 0519a19f48

Change-Id: I164df38c2be8395589499939376de00f3bade7d3