Merge "Update winscope proto lookup path"