Merge "Update dumpstate code that dumps BPF maps."