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

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

Change-Id: I36e296ba392464ecd6f2c713b48f262babb1e53f