am 6ecd1005: am 11eae045: Allow incremental builds for settings.

* commit '6ecd1005834d59a046777a80574db4cc28434ed3':
  Allow incremental builds for settings.