Revert "Finish HalInterfaces.h cleanup"

This reverts commit cadf61007a00e57fb1b180f75bd3c04de7c9f9a9.

Reason for revert: git_master build breakage

Change-Id: I6db2424730ef0dea8586e5c371dc3010e45e7503
Merged-In: I6db2424730ef0dea8586e5c371dc3010e45e7503
(cherry picked from commit bcf6a08e05cd2c6c95e66d2cc847bf5a7cde9579)
2 files changed