fixups for building w/qcom hal

Change-Id: I6a175507e078dfae1534e4ecd159d7d9bb03e6cb