Revert "Revert "Revert "Motox dalvik patch"""

This reverts commit b561ea3d06337ea9e34cd7fd4bca46c5fdd89655.