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

Change-Id: I0556493141b2fc806b941f7cc94ee0ae0f49e86f