Merge "Refactor generated NNAPI tests"