Refactor generated NNAPI tests (follow-up)

Bug: 136097638
Test: m
Change-Id: I0688a843ab04caca9d62f95d38179804eb1b0f80
4 files changed