Revert "Motox dalvik patch"

This reverts commit 70bc370f045cd4da9c83d3b4e88802fb896feb76.