Merge "Systrace support for NNAPI" am: ecb0302ae9
am: ae359622a6

Change-Id: I7e7ae0ff8560368cdb5719550876ea68630eac84