Revert "track system_extras(again)"

This reverts commit 500658d0bf394b99d86c858c68acbe8d7259225e.
Track Telecomm
Conflicts:
	default.xml

Change-Id: Ia7071e0b1a5e6d8cf6a42ef9716a8c766b2949ba