This reverts commit b06bd683. Reason for revert: Broke go/art-build. Reverting as ART Sheriff. Change-Id: I1ab4f5eb22b51b3b348f592c22db340b88af4f7f