Revert "testing...."

This reverts commit ad0c93c7b4c6bc6e47f137be970447b360c4360b.

test in test branch
Added manta and maguro
Fix Name issue for maguro
track our own omap4xxx
	modified:   default.xml

Change-Id: Idc10e774703d6b58c4e84afacd32e65a562d0fe6