Merge "Update HidlInstrumentor."
am: 949f95eafb

Change-Id: I79b026aa7c50998fcf914581a8a70a20746fa2d4