Merge "Systrace support for NNAPI"
am: da2535c0ea

Change-Id: I090393c955ed624cad2b2ea2c2be0247d6bb5cb4