Merge "Remove D8 make variables."