Merge tft-enabled config into make rpi-gonk config, since they can co-exist.