Merge "Fix race in C++ AIDL file generation" am: b2055df782
am: dbc3d09ca6

* commit 'dbc3d09ca6ad5c7116b317dc4199ce64f0636e68':
  Fix race in C++ AIDL file generation