Merge "Convert java_import to java_sdk_library_import"
am: f6a59d137f

Change-Id: I5c899da611c7151c21ecbb5dc48b2988df93a01f