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

Change-Id: I9b68c4862409c125b7f811dc1b4ba053d6603fe6