Merge "Use new -ninja flag to aidl-cpp"