Tweak shamu product makefiles

Change-Id: I95de0a13c2e3e09442636c8a8d6eac0c1a4288eb