Merge "Use library exported headers, not raw path"