Revert "Fix: Bring in a change needed for new libcore, art"

This reverts commit c78cfe75c2f9e4f7e0212000d848bfa577ff0d30.