This is the merge itself. Added DCAN_SANITIZE_UB={0, 1} and nuked 
DASAN_FLEXIBLE_MAPPING_AND_OFFSET=0 (not used now) in corresponding 
Makefiles.