Change how we search for CM makefiles.

Conflicts:
	core/product_config.mk

Change-Id: I00fdb8f425f675bff23924620bedb7d1c6a1b987