Merge "Build System: Prevent unneeded changes to asterisk/buildopts.h."