Merge "Refactor generated NNAPI tests (follow-up)"