Merge "Don't override targetVers with minCode"