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

Change-Id: I905378d90f71aca5f391770e829189be7ace0000