Changes in Prevalence of HIV or Syphilis among Male Sex Workers and Non-Commercial Men Who Have Sex with Men in Shenzhen, China: Results of a Second Survey