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

Change-Id: Ic4d859575ad63ccf6a25b87d33d50d088a0975e6