Merge "Remove per-file CompOS signature support"