Merge "AIDL interface changes for NNAPI feature level 6."