Merge "Refactor generated NNAPI tests (follow-up)" am: 651869e0c6
am: adf64d6cbe

Change-Id: Ie74c1237a2e202d7a2bdf4b93f5df5885ea81256