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

Change-Id: Ide163cd6cd5da7050a7b4faf123433dd4103e0e7