Fix ICU tests

Fix ICU tests that were broken by change

This commit removes test hacks that were put in when
the data was changed to provide PST, CET, etc. as
short names for certain timezones in the root locale.

After this change there are still other android changes,
For example, those related to forcing the gregorian
calendar in certain locales.

Change-Id: Ifc0fb88fe37032abc6611106a65cf281b0f9060c
2 files changed