Merge "Revert "Enable incremental builder to find files that moved, and try to...

Merge "Revert "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add."" into klp-dev