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

Change-Id: I0b783dd17db01849cadb929c0234f4bf0eecb61d