Revert "Move conscrypt back to core image to unblock Golem."

This reverts commit 45d41846d93c5380cadb88c7bb6975b3b8865090.

Changed the "art" script to fix Golem benchmarks.

Change-Id: I78b60f83c2b31e06ed820a6d54ef00c879c243d4
Test: Manually run a Golem benchmark on host and device.
Bug: 119868597
2 files changed