Merge "Remove unused icu4j prebuilt Android.bp" am: 779b68630a
am: 3ebfad364f

Change-Id: I01b8a04b0632c754e944c319ad21a7229d7be67d