Merge "Update HidlInstrumentor." am: 949f95eafb am: d53c97bb0f
am: 86c51c737e

Change-Id: I4115b226d2a3ab1fee9990dda4fdc459b2de43b0