Merge "Faster ResourceFolderType.getFolderType(String folderName)"