Merge "Add CUJ trace parser to Winscope" into udc-dev