Merge "Fix aidl_format errors for NNAPI AIDL."