Merge "Fix CtsIcuTestCases standard and error prone builds"