Fix an issue with gradle not merging ATs properly