Merge "Add Header Library support to Make"