Merge "recovery: add --fsck_unshare_blocks option for adb remount" am: bda4495176 am: b0d9b3594b
am: 5a78f3984f

Change-Id: I61c14d0d3bbdeadacd94c3f11a80f3a19612d539