Merge "Revert "HiKey/HiKey960: Add gatekeeper hal from cuttlefish"" into qt-r1-dev-plus-aosp
am: bb628f251c

Change-Id: Iad7f1d2e4156a5c0fcca14b10a2e4754d1f6c54a