Correct d2 product inclusion ordering, and clean up common giblets with a common product mk file

Change-Id: I91b00307ba5e81bfe0a658b696ca5ca15bd29642