UNITY: Update for upstream build system changes.
UNITY: Update for changes in upstream master graphics API.