Merge commit '7db486058cf4fce4be04e13d1ec6b7cf404d3e38' * commit '7db486058cf4fce4be04e13d1ec6b7cf404d3e38': Config: Add ConfigBuildFlags, and change it based on TARGET_BUILD_TYPE
Merge commit '7db486058cf4fce4be04e13d1ec6b7cf404d3e38' * commit '7db486058cf4fce4be04e13d1ec6b7cf404d3e38': Config: Add ConfigBuildFlags, and change it based on TARGET_BUILD_TYPE