Libcore tests fail. This reverts commit 41aedbb6. Change-Id: I2572f120d4bbaeb7a4d4cbfd47ab00c9ea39ac6c