Revert^2 "Make things match what's in the crate archive."

This reverts commit 4765c1af553c800dc27d0a0a4c46c054af0428fa.

Reason for revert: aosp/3291868 addresses the issue that necessitated this revert (Trusty build issue).

Change-Id: I3755e6845bd06bdb124d845f01e6efcbc30656ef
2 files changed