Update mod_image_for_test to use the new factorytest-init package

mod_image_for_test.sh

 #!/bin/bash
 
 # Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Script to modify a keyfob-based chromeos system image for testability.
 
 # --- BEGIN COMMON.SH BOILERPLATE ---
 # Load common CrOS utilities.  Inside the chroot this file is installed in
@@ skipping 213 matching lines @@
   -r "$ROOT_FS_DIR" -s "$STATEFUL_DIR"
 
 emerge_chromeos_test
 
 MOD_TEST_SCRIPT="$SCRIPTS_DIR/mod_for_test_scripts/test_setup.sh"
 # Run test setup script to modify the image
 sudo GCLIENT_ROOT="$GCLIENT_ROOT" ROOT_FS_DIR="$ROOT_FS_DIR" \
     STATEFUL_DIR="$STATEFUL_DIR" ARCH="$ARCH" "$MOD_TEST_SCRIPT"
 
 if [ $FLAGS_factory -eq $FLAGS_TRUE ]; then
+  sudo INSTALL_MASK="$INSTALL_MASK" $EMERGE_BOARD_CMD \
+    --root="$ROOT_FS_DIR" --root-deps=rdeps \
+    factorytest-init $EMERGE_JOBS
+
   install_autotest
 
   MOD_FACTORY_SCRIPT="$SCRIPTS_DIR/mod_for_factory_scripts/factory_setup.sh"
   # Run factory setup script to modify the image
   sudo GCLIENT_ROOT="$GCLIENT_ROOT" ROOT_FS_DIR="$ROOT_FS_DIR" \
       QUALDB="$FLAGS_qualdb" BOARD=$FLAGS_board "$MOD_FACTORY_SCRIPT"
 fi
 
 # Re-run ldconfig to fix /etc/ldconfig.so.cache.
 sudo ldconfig -r "$ROOT_FS_DIR"
 
 # Let's have a look at the image just in case..
 if [ "$VERIFY" = "true" ]; then
   pushd "$ROOT_FS_DIR"
   bash
   popd
 fi
 
 cleanup
 
 # Now make it bootable with the flags from build_image
 "$SCRIPTS_DIR/bin/cros_make_image_bootable" "$(dirname "$FLAGS_image")" \
                                             "$(basename "$FLAGS_image")"
 
 print_time_elapsed
 
 trap - EXIT