Fix more cherry-pick issues
Fix more cherry-pick issues

cihangxie/cleverhans,openai/cleverhans,cleverhans-lab/cleverhans,fartashf/cleverhans,carlini/cleverhans,carlini/cleverhans,cleverhans-lab/cleverhans,cleverhans-lab/cleverhans