Merge "Merge "add java_api_finder plugin to tethering module" am: 05c43b7095" into stage-aosp-master