Merge "Update theme names after car support library changes."