Merge "Revert "Revert "Move HidlInstrumentor to HidlInternal and namespace details.""" am: eba5145c8c am: a81147642d am: 9df6d95ef5
am: 8cf8338114

Change-Id: I9de18d3826672652f3264f356be972be4967d530