Merge "Remove .mk lines that are just setting the default"