am 750668f5: am 862faa12: Merge "Pull in cleaned version.h header."

* commit '750668f5abd9813bea6f33cb84d941ae306afea8':
  Pull in cleaned version.h header.