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

Change-Id: I7fe1cebfc2c790e94391690ebcd6542e63decf74