am 6c706222: Merge "Remove HAVE_SHORT_ENUMS."

* commit '6c7062221b7582c5d41acdb7a1d865ca629707ed':
  Remove HAVE_SHORT_ENUMS.