Merge "Revert "Move otadexopt-related logic to otapreopt_chroot binary"" am: fb2bda2d86

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1757570

Change-Id: Ic122825d6294788edcddcbeff980d8d518c73c0c