Merge "Add missing java_sdk_library_imports for current/*.jar"