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

Change-Id: I6f17162b73663812f505ef77738f481fc4e628bb