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

Change-Id: I4712542b78364a1ac50f8c3ed4aa2e6ca7dbe37d