Merge "Do not use default namespace to load ANGLE when in vendor partition." into main