Merge "Enable ubsan check flag in build" am: 1907b9905e
am: fe3c61839f

Change-Id: I3a58609d21d730ce8a5bd5dfb66947c7f70a9526