Move conscrypt back to core image to unblock Golem.

Test: Manually run a Golem benchmark.
Bug: 119868597
Change-Id: I9d7878a725ca8f4cd80d999a0f968943bb50ef9a
1 file changed