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

Change-Id: I5d89a238cfc8b576de5a3fd2c31eabeafe66eb4d