am 8a57aac9: am 490ca9c7: Fix incremental builds.

* commit '8a57aac9ad63e97b507b2fd2e4c4b0b62ddf11a1':
  Fix incremental builds.