Merge "Update otapreopt_chroot with new libapexd dependencies."
am: 2d8e815a26

Change-Id: I9cda409bd13a5c885782dcd691b52d038550011f