Merge changes I0913fafa,I91394259

* changes:
  Remove HIDL references in ContextHubTransactionManager
  Remove HIDL references in ContextHubClientBroker/Manager