Merge "add java_api_finder plugin to tethering module"
am: 05c43b7095

Change-Id: Icbfa70318b200b101939dc771ac88c06a26b6704