Bug: 71605148 Bug: 63756964 Test: test-art-target on angler This reverts commit 67169411. Change-Id: Ic01ea4e8bb2c1de761fab354c5bbe27290538631