am ecd3df97: Fix generated files after upstream sync.

* commit 'ecd3df97a36c0381ec63fca3d0762658e2efa17d':
  Fix generated files after upstream sync.