Merge "Systrace support for NNAPI"
am: b05c8a4d80

Change-Id: Iacea8ef17523a7a1cc5f01e516d0909957c73726