Merge "Add host library target"