Merge "Remove clean-jack/dex-files from jack mk" into ub-jack