Merge "Add nearby to java_library_with_nonpublic_deps"