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

Change-Id: Ibbe585e2dd8c9df6ef99cf1aacfb899331f70a80