Fails some benchmarks and libcore tests. This reverts commit db0bbab2. Change-Id: I5d1afef5ede87e65d61f49529027c5c2f35b17fb