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

Change-Id: I7c7ed50c577e3cb077646933d318620b89a9672d