Merge "Refactor ANGLE usage code." into udc-dev