Merge "Compile NetworkStack resources only once" am: 963136ce56
am: 4aea56297c

Change-Id: I3b24d5f07c2b72a761431c836fcc6ff841316043