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

Change-Id: Icce8b11f2a1c380c899ebaac52ac4b2c427492c9