Merge "fs_mgr: harden adb-remount-test.sh" am: e7d638a02b am: 7234c9af19
am: 1ec9c60db6

Change-Id: Ib3f12d4640e1ec3c6d3894d6fa70131af761a37f