Merge "Update HidlInstrumentor."