Revert "Add OEM compatability options for archiving."

Revert submission 25784810-archiving.oemCompat

Reason for revert: Probable culprit for b/321780351. Will be running through ABTD for confirmation and before submitting the revert.

Reverted changes: /q/submissionid:25784810-archiving.oemCompat

Change-Id: I3f95707ab92008250f86025a5d2ba39ec98f9cec
11 files changed