[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 am: 77b15c10 am: 18db7bbc -s ours
am skip reason: Change-Id I44fa537d792ccc205e54e3be460a90994a47c52e with SHA-1 0c36412a is in history
Change-Id: I84a3e687359e1c8771ccdb76eaf74212496c1330