Merge "adb: better error messages on deduplicated filesystems." am: 313aa7172f am: e36d4d53d0
am: 976d471843

Change-Id: Iacb1d41eb623f3e79e0e6ba0a1a83316ff3bc7fa