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

Change-Id: Ib4d782f9d7fe3ecc58a2dce6623e3e8a50ebe2d7