Merge "Convert java_import to java_sdk_library_import"