Merge "Revert "Use toolkit instead of renderscript in SystemUI""