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

Change-Id: Ia580f880150ca27b43d5ca7b5a63e14c90b71f1d