Merge "Refactor ANGLE Platform support"