Merge "Convert java_import to java_sdk_library_import" am: f6a59d137f
am: 02aba3bdfd

Change-Id: I5446cca13ad78c7ed0bc1200dd98e0e56c3a2768