Merge "e2fsdroid: Properly free the dedup block map." am: 1c68004c18 am: 84d5d0245f

Change-Id: Ib65e3cd02283ee8eb3293ae8519f171c3e9dcb6a