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

Change-Id: Ie7e87d27180a77e49a0a8dd1f0dcd87689d420f5