Merge "Fix for compile error when BUILD_HEADER_LIBRARY is used"