Merge "NNAPI: Add OptionalTimeoutDuration to 1.3/types.t" am: 456d54c936 am: 484a48b70f

Change-Id: I15a04ae187fd72305f16c014e4b7c976033632bd