Merge "Remove unused variables from select.mk."