Merge "Move NNAPI type information to types.spec"