Merge "build: Use backup variable when modifying C/CXX flag" into integration