Merge "Move netd related file group to the end for avoiding conflict"