Merge "Refactor generated NNAPI tests" am: caedc76b18 am: e2f9d55a26
am: 0272fa1984

Change-Id: Icd040eb86ce82a535975967d31909d0969925c70