Merge "resources: Register html5shiv as foreign resource"