Merge "Fix reference to header file in art."