Merge "adb: Correctly detect deduplicated ext4 partitions." am: 4c87c1743e
am: 10c43cff04

Change-Id: Ic4c2dbf43e0290c1d3715b956d0887d10c1fe6f9