Add gmock.mk and small updates to Common.mk