Merge changes from topic "gatekeeper_maintenance"

* changes:
  Add HIDLized software gatekeeper HAL to hikey builds.
  Revert "HiKey/HiKey960: Add gatekeeper hal from cuttlefish"