Revert "Revert "Motox dalvik patch""

This reverts commit 11f0393f20a0ea9f950eea6f01e0048d6bdb140c.