Merge "otapreopt: remove transitive libapexd dependencies."