Merge "Fix race in C++ AIDL file generation"