This reverts commit 85baf7a5. The change was ineffective. Bug: 63052624 Test: m test-art-host Change-Id: Id6805e0315feebd2f1afbf41d301074e5518e938