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

Change-Id: I9031674db38881c9094a7ca36a42b03298055e33