Merge "Remove ObjectStreamClass workarounds for API > 24"