am 38476ef2: am 8f1e7b62: Merge "Cleanspec to fix incremental build failures of the form:" into gingerbread

Merge commit '38476ef2f1bc5d8c3540382ea792f709d0b61faf'

* commit '38476ef2f1bc5d8c3540382ea792f709d0b61faf':
  Cleanspec to fix incremental build failures of the form: