Update theme engine code for upstream changes
SystemClock: Add back header for legacy function