Merge "Fix library dependency, remove undeclarate deps"