Merge "Add missing java_sdk_library_imports for current/*.jar" am: 0e1a7397a0

Change-Id: I35fdcb16ae8bff9987471b587274191edcf9adbb