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

Change-Id: I4d4074beb5383c9c3b3ac47048dc49f3e248042c