Merge "NNAPI: Add OptionalTimeoutDuration to 1.3/types.t"