Merge "Add java_api_finder to sdkextensions java code" am: ca4e02fd93 am: 77b1677a99

Change-Id: Iea1497af9eca0c218ee100de0c82988a2780caa2