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

Change-Id: Ibc45a8dfc2a2d2eb1f56fbe458f1495fa4b94982