Track vendor/xp su branch

Change-Id: Ibfae789a09ae8c7ae443cd34507364cda666fe00