Merge "hidl: Update for IFoo::descriptor -> const char *."