hal: Correct compilation errors in hal

Correct compilation errors due to merge of new changes

Change-Id: I83cea7c5d672d24b81bbb767eafc3e1564be561a
5 files changed