Merge "Update ANGLE namespace creation"