Merge "Keystore 2.0: km_compat: Fix ref counting in software keymint device."