Bug 896177 - Remove useless config.mk includes; r=gps
Bug 896177 - Remove more config.mk includes; r=gps