This reverts commit 2905de1c. Reason for revert: test breaks on git_master-art-host; art-test-javac (linux) Change-Id: Ic39d442776858c74d2163683c78bd3a8072ad45e