Merge "Fix problem running ICU CTS tests with old-cts-tradefed" into nyc-dev
am: f2468ee

* commit 'f2468ee1917340274f11332f25782754782d6167':
  Fix problem running ICU CTS tests with old-cts-tradefed

Change-Id: If6a9e99617d7914fbdff23e722a22fd0057557e0