Merge "Invoke the aidl-cpp compiler to generate C++" am: ba39c5690a am: 487cc7beaf
am: 9c694a6242

* commit '9c694a6242a969e27fbd4f043fa7f43ef301b461':
  Invoke the aidl-cpp compiler to generate C++