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

Change-Id: I356147fb3857d69b8e4e6be231e1e8cddf43292e