am 53b3699b: Merge "Remove any stale BuildVariables.inc files in the source tree."

* commit '53b3699b0d46b0bb7c8bf5e4a481b91f5e7aae87':
  Remove any stale BuildVariables.inc files in the source tree.