Merge "Remove rules for building dex with dx"