Indonesia returns foreigners to riot-hit jail