Merge "Remove fsck_unshare_blocks." am: 699ea0f325 am: 79ce1d3420

Change-Id: I2e5b054970ad9d6783130414d7e82d6e62a541de