Revert "Revert "Track Xperience frameworks/base""

This reverts commit dce47ff4609b22830068307118776cc7e0244164.

Conflicts:
	default.xml

Change-Id: Ifa57992bcb48626ddc561105a9396ddc1a68bb53