Merge "Fix incremental builds due to header rename."