Merge "Create HidlInstrumentor to wrap the instrumentation related code."