Merge "Systrace support for NNAPI" am: b05c8a4d80
am: 3faf94f388

Change-Id: Ief7a99c36bb8d8bbe48c781d165b670e0b1ba0cf