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

* commit '0c8537839024466574177e629eb638f5a2623793':
  Avoid compiling ICU4J sample code in libcore