Merge "Use RAII to ensure KeyMint keyblobs deleted"