Merge "adb: warn on remount if undoing deduplication is impossible" am: e619ebc151
am: c3f977c70e

Change-Id: I5960a07e2b7651e7cf58e3cdce4bb57694db748f