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

Change-Id: Ifd91bbf8d720f0b3fd4d7690c97a6d62bd9b685e