Merge "Convert java_library_static to java_library"