[automerger skipped] Add a VERSION constant to the NetworkStack shims. am:...
[automerger skipped] Add a VERSION constant to the NetworkStack shims. am: 0c36412a -s ours am: 3b0d68ad -s ours
am skip reason: Change-Id I44fa537d792ccc205e54e3be460a90994a47c52e with SHA-1 0c36412a is in history
Change-Id: Iaaca45fcb687696638fb6c03879dc3914d0a331f