Revert "Some fix"

This reverts commit bfcdca1d1f27bc996dc470ab7849f65bc6c4d69d.
Revert "Zygote fix for updated libcore"

This reverts commit 4b0f07fbf4f6ad34daa9af0bebf37e8bf74e3157.