Merge "Fix unused src tracking for generated .o files"