Revert "Move all fields of '-cc1' option related classes into def file databases"

This reverts commit c4a2a130.

This commit was causing a test failure: http://lab.llvm.org:8011/builders/llvm-clang-win-x-armv7l/builds/1068