This reverts commit 753a055b. Reason for revert: Fixed failing tests Test: m test-art-host Change-Id: I4a8be656288199108c05c9d302393e1efa41a7a4