Merge "Add java_sdk_library to apex"