Merge "Add CONFIG_VETH (update kernel prebuilt)" am: 3a07a2aef6
am: 3d2cab13fe

Change-Id: I648c1a34bfe02275f7450d359f9b66441944794f