Merge "Invoke HIDL for C++ files"