Merge "Make android_icu4j_src_files visible to libcore/mmodules/intracoreapi"
am: b6c2e48543

Change-Id: Ie8c8d28f1df30a357f118d1e47c721c96bf9176b