Merge "Change CombinedApis to actually use WalkDepsProxy, also uses the newly added AndroidLibraryDependencyInfo." into main