Merge "otapreopt: remove transitive libapexd dependencies." am: e5500e6b13 am: 0e7cbcfa8c am: 63c68b87a9
am: f304d2acca

Change-Id: I1a1c05451672fda8087a9b0acdbb42df243d1a56