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

Change-Id: I61105d14c7d671773185885199b20443e47fd1f2