Make SDF slightly more lenient about parsing zone strings.

We tolerate a colon even formats that don't specify it. Also, the
existing code for verifying that a colon exists has been rewritten
for clarity.

bug: 26426526
Change-Id: Iea4ef6be0174a86d31df7ad9b6636ef904991cea
2 files changed