Merge "Build system support to export include paths"