Merge "Implement NNAPI canonical interfaces"