Failures with libcore tests. This reverts commit 64acf303. Change-Id: Ie6f323fcf5d86bae5c334c1352bb21f1bad60a88