Merge "Split -isystem headers into separate variables"