Merge "Apply aidl_format to NNAPI AIDL interface files"