gooftool: `gsctool -r disable` is replaced by `gsctool -F disable`.

Factory mode of cr50 will be introduced soon so gsctool is modified as
well in order to support enable / disable factory mode by `gsctool -F`.
And disabling factory mode would also disable RMA mode of cr50 so the
command of `gsctool -r disable` is changed to `gsctool -F disable`.

BUG=b:111380209
TEST=manually test on the DUT

Change-Id: I6853b133641f5c8d27944cd3597a976a7748a0dc
Reviewed-on: https://chromium-review.googlesource.com/1136454
Commit-Ready: Marco Chen <marcochen@chromium.org>
Tested-by: Marco Chen <marcochen@chromium.org>
Reviewed-by: Mary Ruthven <mruthven@chromium.org>
diff --git a/py/gooftool/commands.py b/py/gooftool/commands.py
index 6afa8d0..a826598 100755
--- a/py/gooftool/commands.py
+++ b/py/gooftool/commands.py
@@ -403,9 +403,9 @@
 
 
 @Command('cr50_disable_rma_mode')
-def Cr50DisableRmaMode(options):
+def Cr50DisableFactoryMode(options):
   """Reset Cr50 state back to default state after RMA."""
-  return GetGooftool(options).Cr50DisableRmaMode()
+  return GetGooftool(options).Cr50DisableFactoryMode()
 
 
 @Command('enable_release_partition',
@@ -692,7 +692,7 @@
     GetGooftool(options).WriteVPDForRLZPing(options.embargo_offset)
   Cr50SetBoardId(options)
   Verify(options)
-  Cr50DisableRmaMode(options)
+  Cr50DisableFactoryMode(options)
   LogSourceHashes(options)
   UntarStatefulFiles(options)
   if options.cros_core: