Merge "Update sync fence related API for NNAPI" am: 1eb640d440

Change-Id: I83808f988b7e27d405b66c63feae311ed175e46b