Merge "Revert "Initial add wvts to build"" am: e61203da am: 6946b25e am: 77e2b1d7

Original change: https://android-review.googlesource.com/c/platform/build/+/2382972



Change-Id: I9373282ac961c40f4b13536bc8c9d9548cba1e9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>