am 490ca9c7: Fix incremental builds.

* commit '490ca9c785d4e635c4cea49f04e671c0c8c0ad6c':
  Fix incremental builds.