Put conscrypt and core-icu4j back into the build targets again.

Partially reverts https://r.android.com/1854516 - these targets are
necessary for Vogar after all (but "m installclean" doesn't clean
enough to verify that).

Test: lunch armv8-eng
      rm -rf out/target/common && \
      art/tools/buildbot-build.sh && \
      art/tools/buildbot-teardown-device.sh && \
      art/tools/buildbot-cleanup-device.sh && \
      art/tools/buildbot-setup-device.sh && \
      art/tools/buildbot-sync.sh && \
      art/tools/run-libcore-tests.sh --mode=device --variant=X64
Bug: 203776358
Bug: 202521005
Change-Id: I73ce52d86992a8582b16822dbfa75c7e258d2de2
1 file changed