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

Change-Id: I5841228488c8fa4b32c1e2783f271072a8856633