Merge "Remove usages of java_api_finder"