Merge "consolidate target_files metadata into one key-value file" into gingerbread