Riot police, villagers clash in China