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

Change-Id: I4b13e1366dd58bdc2444aa259531f6aaf9ffc972