Revert "Deodexed build"

This reverts commit c66b06012907b2d661dd02189a1a64e08f2461d9.