Revert "Move HidlInstrumentor to HidlInternal and namespace details." am: f9fd88291c
am: 1acc8b51eb

Change-Id: I359e172625adf5ef9ba76d8663477e6c68cfdbb3