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

Change-Id: I9eeaa80e3f2a51a9f47d067d4106417ff030a5e4