Merge "Remove reference to deleted file Common.mk"
am: 8f7a4bf103

Change-Id: I0e19cf1eca17fa9ba3682a838cdb3ab863f771af