Merge "Make NNAPI Version more structured -- hal"