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

Change-Id: I174a988acb30fba0f5c58b061a881eecd89ae8f7