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

Change-Id: I31fdf7091eb39e5c22042afcdad9349c23697164