Merge "Remove any stale BuildVariables.inc files in the source tree."