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

Change-Id: I2c869fcaca8d99eb4adc1a05ef009bad5c8f1025