Merge "Remove renamed .inc files from phan config"