Merge "Build core-icu4j against core_current sdk" am: f706960554 am: abe644392b
am: d3c5df820b

Change-Id: I375b0e3d637c43e094e9ad2e3a67b78808c366de