core: Get the RIL variant path into the global includes

 * Need to have this in the global path, so shuffle things around a little.

Change-Id: I2dd2b378d17ff3fa0e379793df31d68964d87278
Merge remote-tracking branch 'cm/cm-12.0' into sm-5.0