Merge "Avoid compiling ICU4J sample code in libcore"
am: 6e7bd7582b

* commit '6e7bd7582b83051c6a70edfdba992c7fddef54ec':
  Avoid compiling ICU4J sample code in libcore