Track our own core and extras

Change-Id: Ib4955049e8c033ff786769633ea1877c921049b4