Merge "Add build rule for assertj-core"