Merge "Remove reference to deleted file Common.mk" am: 8f7a4bf103 am: 3257b32ae5
am: 4f6c59f4d3

Change-Id: Ief5d910cf09204ebee5132911d5da3a39d48a4da