Merge "Revert "crypto: Fix memory leak in bam_release call""