Track own system/extras

Change-Id: Iee3e21e5de15c84be6e7e80010012c82029eee8b