Remove import workaround of SplitResult

six 1.6.0 includes fix for SplitResult, we can remove the
workaround now.

Change-Id: I79aa154bac7e23e18ac63190f031cc937573e8ee
Merge "Remove import workaround of SplitResult"