Merge "hidl: Update for IFoo::descriptor -> const char *." am: e17e68f139
am: 5f9ac42029

Change-Id: I29e5b04d4737dcc380ac34a0becfe633fc1d51db