Merge "Systrace support for NNAPI" am: da2535c0ea
am: fdc259bfb5

Change-Id: I1febcefc09c44353935cb63f9d326ac5721cdbea