Merge "Revert "Move otadexopt-related logic to otapreopt_chroot binary""