Merge "Revert "Revert "Move HidlInstrumentor to HidlInternal and namespace details.""" am: eba5145c8c
am: a81147642d

Change-Id: Ia191cba7e91516cb397d55a7e7ce8ecd40417ed7