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

Change-Id: Id68dedc78b74c75e1b94eaea4d27771673150bdb