Merge "Rename NetworkStack package"
am: e4a40c77e1

Change-Id: I0acdbd8716b67241367c78b7c190b72086e2db4d