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

Change-Id: I68cbc6563c3946ee8fd7cff414bda5c38d47fd74