Revert "Motox dalvik patch"

This reverts commit ec09cfa8f05994dd387e7276333d44e9745fb0a9.