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

Change-Id: I417ab29c84dc3f10ee317a184f59d25184c7dfdc