Merge "otapreopt: remove transitive libapexd dependencies."
am: e5500e6b13

Change-Id: I79e7dcb3d171f939b85427672fcba95a2e468d93