Remove autogenerated options files which were added back in Also, update xcode/make_project.py to (re)generate options automatically.