Merge "keystore2: Remove explicit dep on C DSOs"