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

Change-Id: I1d57b2e4fccd52260aab4da8958b2052030ff492