am f521a8e8: am 6afbda9f: Merge "Clean common intermediate files if overlay changed" into jb-dev

* commit 'f521a8e888a425dcd5fff70d18d14c9324e2d3aa':
  Clean common intermediate files if overlay changed