Refactor NN API VTS tests and add v1.1 tests am: 4862d612ad
am: 455b5b3ca2  -s ours

Change-Id: Ib567178a2df436cc7ee344e9ce6b4642524e419e