Merge "Update runtime header generator"