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

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

Change-Id: Ib12899712c1971f495125ef6c07fd84e0d54f9d6