Merge "Migrate NNAPI to canonical types"