Merge "Remove use of preference-v14 res directory that is removed."