Merge "Remove reference of nonexistent resource dir."