Track Maguro and Tuna plus Samsung from ShinyROM

Change-Id: I74d9101d3de421e2aeaeb00fd4fffb03009c936a