Merge "Remove reference to deleted file Common.mk"