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

Change-Id: I1764c97febd9e5a27fd2c97acedd3836f0510a93