Merge change 845 into donut

* changes:
  Config: Add ConfigBuildFlags, and change it based on TARGET_BUILD_TYPE