Revert "bpf: Defer the free of inner map when necessary"

This reverts commit 37d98fb9 which is
commit 87667336 upstream.

It breaks the build as other previous commits that were reverted for ABI
issues are not in the tree here.

Bug: 161946584
Change-Id: I6f30910efb8877d024e8e0866f2e62e3b25e0959
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>