Revert "switch to Z2 dalvik patch"

This reverts commit 6f05f2ff00c266c1bbd3312eb1f18f648c4c9488.