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

* commit '487cc7beaff3e4fecd92504c1972d6d53079f84e':
  Invoke the aidl-cpp compiler to generate C++