Merge "applypatch: Don't expose FindMatchingPatch()."