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

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

Change-Id: I3c77b7344b6e9480bdefb61c5823a654e69b642d