Change the ordering of countryzones.txt am: bb8d812a6d am: fe695d4001 am: d2113feefe

Change-Id: I1fad1a6fcac7622ecfb4294158dd00748d38ff34