Don't include the common config twice...

Change-Id: Ia23d0f44596242d9d7a5e65b9f22dbd85c6dd004