Merge "Make android_icu4j_src_files visible to libcore/mmodules/intracoreapi"