Merge "Fix potental incremental build failure with leftover RS generated files."