Merge "Keep aidl generated C++ inside the generated folder"