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

Change-Id: Iaa8593f981db12b65a6eb13fddf5e894f58ca7a7