Merge "Make target-sync work with verity."