Reconcile differences with CM's product makefiles

Change-Id: I7ea15acd04edb93e254457dba06b1d54cc6a9dfb