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