Merge \\"Split -isystem headers into separate variables\\" am: 921be36569
am: 768291a37c

Change-Id: I5745167088de0a22dcc64cff7c5e848d747f431f