Revert^2 "Add OEM compatability options for archiving."

Reason for revert: Fixing the broken test (AtomTests) in same topic

e1ab950b462ddff10687408ed074d39d55c087fe

Change-Id: If0fbbb19e7b1fd82147a19747a15fc9958eb1e3a
11 files changed