Merge "Revert "Revert "Move HidlInstrumentor to HidlInternal and namespace details."""