Merge "Add NNAPI control flow"