This reverts commit fbe160b2. Test: m -j ANDROID_COMPILE_WITH_JACK=false test-art-host Change-Id: I76008336169b11ee1637101f69bdc4ffc8670c8a