Merge "Fix ubsan failure in android::base::Split." am: aa9548dbb4
am: 09980cd1a8

Change-Id: I49116f209d65365cc1caf3a50c09c7cc4178ecff