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