Merge "Revert "Allow otapreopt_chroot to call otadexopt binder service""