Merge "Do not link libc++.so statically on device." am: 98eccba8b4

am: b4f9d86666

Change-Id: I91577bdad7e9f6ad73002d3e3bad2a5f784a8a7c

cc/fuzz.go

@@ -148,10 +148,14 @@ func NewFuzz(hod android.HostOrDeviceSupported) *Module {
 	// include the STL.
 	android.AddLoadHook(module, func(ctx android.LoadHookContext) {
 		staticStlLinkage := struct {
-			Stl *string
+			Target struct {
+				Linux_glibc struct {
+					Stl *string
+				}
+			}
 		}{}
 
-		staticStlLinkage.Stl = proptools.StringPtr("libc++_static")
+		staticStlLinkage.Target.Linux_glibc.Stl = proptools.StringPtr("libc++_static")
 		ctx.AppendProperties(&staticStlLinkage)
 	})