Remove unused variables from common.config

These variables were not used, so they've been removed.

Change-Id: I15e7a3f96f00fa46cbbc5132902d0b95d1a4d07c
Merge "Remove unused variables from common.config"