This reverts commit 6c8c54ee.

Conflicts:
	solenv/gbuild/extensions/pre_MergedLibsList.mk

Change-Id: I6393507344297990dfcc6e234c7b0e503a8bd10b