Merge "Resolve compilation errors in HAL projects"