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

Change-Id: I00639cc6b70deb38871e9b93f86e71c7a71a4f76