X64 has one libcore test failing, and codegen_test on arm is failing. This reverts commit 6004796d. Change-Id: I20e00431fa18e11ce4c0cb6fffa91977fa8e9b4f