Revert "Track changes to Conscrypt". DO NOT MERGE ANYWHERE.

Tracking the revert of the corresponding conscrypt CL.

This reverts commit fd84dad8.

This is a clean revert. The upload hook to fix lint errors was not run
(this CL was uploaded with --no-verify).

Test: Treehugger
Test: make droid cts
Bug: 62424503

Change-Id: I2fa2e23a24940588e32ebfb08bb8b38a5c20d0cb