Merge change 20654

* changes:
  The build system knows how to deal with lex files, but it treats them as c++, so make spec.lex conform to that.