Merge "NNAPI narrow evaluation for P -- HAL"