Revert "Revert "switch to Z2 dalvik patch""

This reverts commit 29cbea0655c477e097d02fda16261c67e724ec06.