Merge "munmap() buffers after running bsdiff in main." am: 7d4f51b407 am: 1ae5000dd8
am: 7f98a953cf

Change-Id: I82e3bd56bcda6b76c5b91fe5401173920ac71114