This reverts commit ba037b12. Test: m test-art-host, with new oat file assistant test added. Bug: 34339100 Change-Id: I1ab9ec9f6ec299be7b8144612b71e6054d84412c