Merge "Only include android_icu4j production files"
am: d0e0ee6ce4

* commit 'd0e0ee6ce44a5bc08c9ab1dccc21e66e394e9b7e':
  Only include android_icu4j production files