Merge "Fix indexing bug in NNAPI"