am be4f1471: Merge "Fix incremental builds" into jb-dev

* commit 'be4f1471152ef1377ca7387b1ae0e9ee2ab108c4':
  Fix incremental builds