Revert "core: Get the RIL variant path into the global includes"

This reverts commit c5aff16e9b0c7dea8f3c52110b6d397b248b1762.
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

Conflicts:
	core/config.mk