Merge "Update otapreopt_chroot with new libapexd dependencies."