Merge "Clean up car user lib in system UI."