Auto-backup files prior to running the removal script and don't overr…

…ide backups.

docker/android/scripts/build-system.py

@@ -82,7 +82,9 @@ def remove_makefile_tests(path, args, *_):
 
 
 def remove_tests(path, args, processor):
-    if not args.disable_backup:
+    if os.path.exists(path + '.bak'):
+        restore(path, args)
+    elif not args.disable_backup:
         backup(path, args)
     processor(path, args)