Merge "GKI cleanup - Moved struct TIMER_LIST_ENT to OSI"