Reverting because of libcore failures. This reverts commit 7a9c8856. Change-Id: Iafe59b02fe7617243d81533d66e609a3528e7a58