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

Change-Id: I17cbe8fa6c0ab422bb30c2dab3e4e75386c0d2dc