Merge "Keep aidl generated C++ inside the generated folder"
am: 11feb8b075

* commit '11feb8b075ce48fc4b6386049a666a5e888247f8':
  Keep aidl generated C++ inside the generated folder