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

Change-Id: I8ff3b57e2e6f054b3ad2ef1deaff71328d6240c0