Merge "Header library to remove dependence on runtime/"