Merge "Add test for android::base::Split with a trailing empty part." am: 972753e094
am: bd0f354eb4

Change-Id: I7556e08420bd8e3448b2a62724ed8ae152691aba