[automerger skipped] Merge "Refactor generated NNAPI tests" am: caedc76b18 am: e2f9d55a26 am: 0272fa1984 am: 81aa1bf8ed
am: 53eec2383c -s ours
am skip reason: change_id I6fdede028422145d313d46532b5d2154ef0d40bc with SHA1 2bcfdc82a0 is in history

Change-Id: I3de4dd6a280820ed1be52c450ac37fe7a85db7c0