Merge "Systrace support for NNAPI"
am: ecb0302ae9

Change-Id: I16dbb15a6139105b7e04761cdbcffff32b8b1706